Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 22 May 2010 03:32:53 +0000 (03:32 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 22 May 2010 03:32:53 +0000 (03:32 +0000)
commit9f3d6cfb8910b5fce584fa33a59cbad40ce0a5af
tree18f7b51832cd8e24ee15d89ff1bc1448050b9d87
parent44a4e9b5da4e5af3db6eb54ee5ba8b2f702cb2dd
parent9a9fd97ce6281a88b4d40932c14fb22d81a2af46
Merge from mainline.